From eb8b146a00ce710ecda11e0524b5d50cd98ca17f Mon Sep 17 00:00:00 2001 From: "Ian.Campbell@xensource.com" Date: Mon, 22 May 2006 17:03:24 +0100 Subject: [PATCH] Fix x86/64 by passing the required length to reserve_bootmem instead of the end address Fixup a warning since the machine_e820 and memmap variables are only used if CONFIG_XEN_PRIVILEGED_GUEST. Signed-off-by: Ian Campbell --- linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c index e986dfeafc..adfd37d048 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c @@ -626,10 +626,12 @@ void __init setup_arch(char **cmdline_p) { unsigned long kernel_end; -#ifdef CONFIG_XEN +#if defined(CONFIG_XEN_PRIVILEGED_GUEST) struct e820entry *machine_e820; struct xen_memory_map memmap; +#endif +#ifdef CONFIG_XEN /* Register a call for panic conditions. */ notifier_chain_register(&panic_notifier_list, &xen_panic_block); @@ -741,7 +743,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_XEN /* reserve physmap, start info and initial page tables */ - reserve_bootmem(kernel_end, table_start<